From e0240a06f801239c7dc80ae6e247f107e2d0ac38 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 24 Jan 2012 15:30:46 +0000
Subject: [PATCH] libxl: remove _libxl_json_internal.h from libxl_json.h

libxl_json.h is intended as a user-includable header for applications which
would like to use libyajl directly with libxl types. It should not expose libxl
internals.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/libxl/libxl_internal.h | 4 +++-
 tools/libxl/libxl_json.h     | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 39e9e052fe..3c8da450f2 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -61,9 +61,11 @@
 #include "flexarray.h"
 #include "libxl_utils.h"
 
-#include "_libxl_types_internal.h"
 #include "libxl_json.h"
 
+#include "_libxl_types_internal.h"
+#include "_libxl_types_internal_json.h"
+
 #define LIBXL_DESTROY_TIMEOUT 10
 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
 #define LIBXL_XENCONSOLE_LIMIT 1048576
diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h
index 0715019ca5..720f6df10f 100644
--- a/tools/libxl/libxl_json.h
+++ b/tools/libxl/libxl_json.h
@@ -18,6 +18,5 @@
 #include <yajl/yajl_gen.h>
 
 #include <_libxl_types_json.h>
-#include <_libxl_types_internal_json.h>
 
 #endif /* LIBXL_JSON_H */
-- 
2.30.2